Partially revert 21550029f709072aacf3b90edd574e7d3021b400
authorStefano Stabellini <sstabellini@kernel.org>
Tue, 8 Nov 2016 19:42:43 +0000 (11:42 -0800)
committerStefano Stabellini <sstabellini@kernel.org>
Wed, 9 Nov 2016 22:29:59 +0000 (14:29 -0800)
commit420596c8685d2c413ef4fc11fc942739b856a049
treeeb1a0affd9ade683d06b7d463b9778c221a4b648
parent79c9f5ef82b6964f03fa0171c23a73d00bc971c5
Partially revert 21550029f709072aacf3b90edd574e7d3021b400

Commit 21550029f709072aacf3b90edd574e7d3021b400 removed the
PLATFORM_QUIRK_GIC_64K_STRIDE quirk and introduced a way to
automatically detect that the two GICC pages have a 64K stride.

However the heuristic requires that the device tree for the platform
reports a GICC size == 128K, which is not the case for some versions of
XGene.

Fix the issue by partially reverting
21550029f709072aacf3b90edd574e7d3021b400:

- reintroduce PLATFORM_QUIRK_GIC_64K_STRIDE for XGene
- force csize and vsize to SZ_128K if csize is initially 4K and if
  PLATFORM_QUIRK_GIC_64K_STRIDE

Also add a warning in case GICC is SZ_128K but not aliased.

Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Julien Grall <julien.grall@arm.com>
xen/arch/arm/gic-v2.c
xen/arch/arm/platforms/xgene-storm.c
xen/include/asm-arm/platform.h